[EP ABI] Update Graph_GetGraphView() implementation by chilo-ms · Pull Request #26711 · microsoft/onnxruntime

chilo-ms · 2025-12-03T00:36:34Z

Description

This PR mainly modifies the followings:

Update Graph_GetGraphView() implementation.
Make sure EpGraph maintains the min/max node index, so that when querying node outside that range, it can return null.
Provide option to create an EpGraph that contains its parent node when the graph is the subgraph of a control flow op.

Update Graph_GetGraphView() implementation

In some cases, e.g. when model has a node that produces output consumed by multiple nodes, calling the current implementation of Graph_GetGraphView() to get a subgraph returns incorrect OrtGraph.

Original graph:
Incorrect graph after calling Graph_GetGraphView() to get the subgraph:

It includes three of the nodes from the original graph.
The topk_indices is the output of the TopK and it shouldn't be added as a graph input shown in the graph below.
The API implementation has issue handling this case.
If we feed this subgraph into TRT parser, it would fail to parse the graph.
Correct graph after calling Graph_GetGraphView() to get the subgraph:

It includes three of the nodes from the original graph.
The topk_indices now is not added as a graph input. Instead, the topk_indices is added as a graph output which is expected as Mod is in another subgraph that consumes it, so this subgraph has to make topk_indices a graph output.

Motivation and Context

github-actions

You can commit the suggested changes from lintrunner.

onnxruntime/test/ep_graph/test_ep_graph_utils.cc

onnxruntime/test/ep_graph/test_ep_graph_utils.h

adrianlizarraga

Hi Chi, I had some initial comments.

Also, I think there is existing code that seems to do something very similar:

onnxruntime/onnxruntime/core/providers/partitioning_utils.cc

Lines 287 to 368 in 8f8069d

    
           std::unique_ptr<ComputeCapability> MakeComputeCapability(const GraphViewer& graph_viewer, 
        
                                                                    const std::vector<const Node*>& group, 
        
                                                                    const GenerateMetadefNameFn& generate_metadef_name, 
        
                                                                    const std::string& execution_provider_name, 
        
                                                                    bool drop_constant_initializers) { 
        
             std::unordered_set<const Node*> node_set; 
        
             node_set.reserve(group.size()); 
        
             node_set.insert(group.cbegin(), group.cend()); 
        
             std::unique_ptr<IndexedSubGraph> sub_graph = std::make_unique<IndexedSubGraph>(); 
        
             std::unordered_set<const NodeArg*> node_outputs; 
        
             std::unordered_set<const NodeArg*> subgraph_inputs; 
        
             std::unordered_set<const NodeArg*> subgraph_outputs; 
        
             std::vector<const NodeArg*> ordered_subgraph_inputs; 
        
             std::vector<const NodeArg*> ordered_subgraph_outputs; 
        
             const auto& graph_output_list = graph_viewer.GetOutputs(); 
        
             std::unordered_set<const NodeArg*> graph_outputs(graph_output_list.cbegin(), graph_output_list.cend()); 
        
             for (const Node* node : group) { 
        
               sub_graph->nodes.push_back(node->Index()); 
        
               for (const auto* input : node->InputDefs()) { 
        
                 if (!input->Exists()) { 
        
                   // skip the placeholder inputs 
        
                   continue; 
        
                 } 
        
                 // if the node input was not produced by this subgraph, add it to the subgraph inputs. 
        
                 if (!Contains(node_outputs, input)) { 
        
                   if (!Contains(subgraph_inputs, input)) { 
        
                     subgraph_inputs.insert(input); 
        
                     ordered_subgraph_inputs.push_back(input); 
        
                   } 
        
                 } 
        
               } 
        
               const auto& output_defs = node->OutputDefs(); 
        
               for (const auto* output_def : output_defs) { 
        
                 node_outputs.insert(output_def); 
        
                 // if output is overall graph output we need to produce it. 
        
                 if (Contains(graph_outputs, output_def)) { 
        
                   ordered_subgraph_outputs.push_back(output_def); 
        
                 } 
        
               } 
        
               // if output connects to a node not in this subgraph we need to add it 
        
               // unless it was already added as an overall graph output, 
        
               for (auto it = node->OutputEdgesBegin(), end = node->OutputEdgesEnd(); it != end; ++it) { 
        
                 if (!Contains(node_set, &it->GetNode())) { 
        
                   const auto* output_def = output_defs[it->GetSrcArgIndex()]; 
        
                   if (!Contains(subgraph_outputs, output_def) && !Contains(graph_outputs, output_def)) { 
        
                     subgraph_outputs.insert(output_def); 
        
                     ordered_subgraph_outputs.push_back(output_def); 
        
                   } 
        
                 } 
        
               } 
        
             } 
        
             // Assign inputs and outputs to subgraph's meta_def 
        
             auto meta_def = std::make_unique<::onnxruntime::IndexedSubGraph::MetaDef>(); 
        
             meta_def->name = generate_metadef_name(); 
        
             meta_def->domain = execution_provider_name; 
        
             meta_def->since_version = 1; 
        
             meta_def->status = ONNX_NAMESPACE::EXPERIMENTAL; 
        
             for (const auto& input : ordered_subgraph_inputs) { 
        
               if (drop_constant_initializers && graph_viewer.IsConstantInitializer(input->Name(), true)) { 
        
                 continue; 
        
               } 
        
               meta_def->inputs.push_back(input->Name()); 
        
             } 
        
             for (const auto& output : ordered_subgraph_outputs) { 
        
               meta_def->outputs.push_back(output->Name()); 
        
             } 
        
             sub_graph->SetMetaDef(std::move(meta_def)); 
        
             return std::make_unique<ComputeCapability>(std::move(sub_graph)); 
        
           }

Since that code has been tested, perhaps there's some way to reuse some of the implementation in some way? Just fyi.

onnxruntime/core/session/onnxruntime_c_api.cc

…a control flow op

onnxruntime/core/session/onnxruntime_c_api.cc

onnxruntime/core/graph/ep_api_types.h

…all builds

onnxruntime/core/graph/ep_api_types.cc

onnxruntime/core/graph/ep_api_types.h

include/onnxruntime/core/providers/utils/ort_graph_to_proto.h

onnxruntime/core/graph/ep_api_types.cc

include/onnxruntime/core/providers/utils/ort_graph_to_proto.h

onnxruntime/core/graph/ep_api_types.cc

onnxruntime/core/graph/ep_api_types.h

onnxruntime/core/graph/graph_viewer.cc

onnxruntime/core/session/onnxruntime_c_api.cc

… won't contain the outer-scope initializers

onnxruntime/core/graph/ep_api_types.cc

onnxruntime/core/session/onnxruntime_c_api.cc

### Description This PR mainly modifies the followings: - Update `Graph_GetGraphView()` implementation. - Make sure EpGraph maintains the min/max node index, so that when querying node outside that range, it can return null. - Provide option to create an EpGraph that contains its parent node when the graph is the subgraph of a control flow op. #### Update Graph_GetGraphView() implementation In some cases, e.g. when model has a node that produces output consumed by multiple nodes, calling the current implementation of `Graph_GetGraphView()` to get a subgraph returns incorrect `OrtGraph.` - Original graph: <img width="414" height="356" alt="image" src="https://github.com/user-attachments/assets/739c092d-0880-4f6e-9351-e08e0e141b35" /> - Incorrect graph after calling `Graph_GetGraphView()` to get the subgraph: It includes three of the nodes from the original graph. The `topk_indices` is the output of the `TopK` and it shouldn't be added as a graph input shown in the graph below. The API implementation has issue handling this case. If we feed this subgraph into TRT parser, it would fail to parse the graph. <img width="349" height="341" alt="image" src="https://github.com/user-attachments/assets/1306e22c-7c5d-45a2-bc18-6864fa2966ba" /> - Correct graph after calling `Graph_GetGraphView()` to get the subgraph: It includes three of the nodes from the original graph. The `topk_indices` now is not added as a graph input. Instead, the `topk_indices` is added as a graph output which is expected as `Mod` is in another subgraph that consumes it, so this subgraph has to make `topk_indices` a graph output. <img width="413" height="350" alt="image" src="https://github.com/user-attachments/assets/b9135690-a341-41b2-9495-184030ab5cff" /> ### Motivation and Context  (cherry picked from commit a0d4439)

### Description This PR cherry-picks the following changes for the 1.24.0 release. ### Cherry-picked Commits | Commit | Commit Title | Author | |---|---|---| | 744e7fe | Add type definitions, registration, utilities for INT2/UINT2 support (#26824) | vraspar | | 530a1fb | [QNN EP] Add BFloat16 dtype support in QNN EP (#26987) | tirupath-qti | | 8e050d1 | Implement new experimental lookup-based matrix multiplication method(TMAC) (#26695) | vraspar | | 2d2ba6b | [MLAS/CPU EP] Improve performance of Silu activation path within the QuickGelu CPU kernel (#26753) | Hariharan Seshadri | | 1c02b79 | [QNN EP] Add support for handling 0-dimension for Concat Op (#27000) | Ashwath Shankarnarayan | | cc2b01b | Fix ClipQuantFusion crash when Clip has multiple input edges (#27016) | Edward Chen | | bbd3850 | [QNN EP] Support quantized BatchNorm with per-channel DQ params on QNN HTP (#26959) | qti-yuduo | | d8f0318 | Add API to get ep graph partitioning info (#26781) | Adrian Lizarraga | | b912b18 | [OVEP] OpenVINO EP Features and bug-fixes for ORT-1.24 - Follow up (#27007) | Preetha Veeramalai | | ba11af4 | [QNN-EP] Add MatMulNBits translation for GPU (#26340) | quic-tirupath | | c03c419 | [MLAS/NEON] Add dedicated kernel for depthwise convolution for ARM64 using NEON intrinsics (#26688) | Hariharan Seshadri | | e7dfd69 | [QNN-EP] Support alternate Layernorm fusion pattern in QNN preprocess (#26060) | qti-mattsinc | | 4013dc1 | Implement multithreading in qgemm_kleidi (#26301) | Melike Kaptan | | 9f06181 | [CXX] Enable users to specify custom OrtSyncStream via RunOptions (#26988) | Dmitri Smirnov | | cfccd64 | Added support for QMX kernels in MLAS (#26849) | qti-vaiskv | | 29d9b2f | Tweak external resource importer handle structs (#27040) | Scott McKay | | 9d108d0 | [QNN EP] Add QuickGELU operator support for QNN provider (#27034) | tirupath-qti | | b35688f | Add INT2 and UINT2 support for QDQ, transpose and cast ops (#27022) | vraspar | | 6d34aba | Introducing BF16 Pointwise NCHWc Convolution for Arm64 (#26838) | Rohanjames1997 | | 36017ad | [EP ABI] Add CreateCustomOpDomains() API for plugin EP to register custom ops (#27050) | Chi Lo | | 50a03e4 | Add a new pipeline for CUDA 13 nuget builds (#27023) | eserscor | | a0d4439 | [EP ABI] Update Graph_GetGraphView() implementation (#26711) | Chi Lo | | 34bb209 | [webgpu] Fix a bug for im2col (#27069) | Wenqin Yang | | 46e8d45 | [QNN EP] Add FusedMatMul operator support (#27044) | tirupath-qti | | 5e7e7a3 | Disable Float32_2Bits_Asymmetric_256x256 test (#27046) | vraspar | | 39f966e | Fix Doxygen documentation build error in onnxruntime_c_api.h (#27083) | Nick Eubanks | | 8a7a797 | Print tensor for new packed type of 2 bits (#27064) | Tianlei Wu | | 01f40e6 | Fix GPU JAR testing on Linux (#27011) | eserscor | | b6ed7f3 | Fix warning around ununsed code in QNN Android Emulator builds by clang (#27026) | Hariharan Seshadri | | d7daa45 | Raise the timeout for the ios simulator job (#27045) | Hariharan Seshadri | | 7e1d818 | upgrade emsdk to 4.0.23 (#27029) | Yulong Wang | | 347b990 | Fix failing mainline build on Arm64 linux (#27101) | Rohanjames1997 | | f481b17 | Add dedicated API to support extracting compatibility string from model metadata (#27015) | adrastogi | --------- Signed-off-by: Liqun Fu <liqun.fu@microsoft.com> Signed-off-by: bfilipek <bartlomiej.filipek@intel.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jonathan Clohessy <jonathan.clohessy@arm.com> Signed-off-by: Christian Bourjau <christian.bourjau@quantco.com> Signed-off-by: melkap01 <melike.kaptan@arm.com> Co-authored-by: vraspar <vrajang@outlook.com> Co-authored-by: tirupath-qti <tirupath@qti.qualcomm.com> Co-authored-by: Ashwath Shankarnarayan <ashwshan@qti.qualcomm.com> Co-authored-by: Liqun Fu <liqun.fu@microsoft.com> Co-authored-by: carzh <wolfivyaura@gmail.com> Co-authored-by: Hector Li <hecli@microsoft.com> Co-authored-by: carzh <carolinezhu@microsoft.com> Co-authored-by: Vrajang Parikh <vrparikh@microsoft.com> Co-authored-by: Hariharan Seshadri <shariharan91@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com> Co-authored-by: Yuduo Wu <yuduow@qti.qualcomm.com> Co-authored-by: Adrian Lizarraga <adlizarraga@microsoft.com> Co-authored-by: Preetha Veeramalai <preetha.veeramalai@intel.com> Co-authored-by: jatinwadhwa921 <110383850+jatinwadhwa921@users.noreply.github.com> Co-authored-by: jatinwadhwa921 <jatin.wadhwa@intel.com> Co-authored-by: saurabh <saurabh1.kale@intel.com> Co-authored-by: Ankit Maheshkar <ankit.maheshkar@intel.com> Co-authored-by: sfatimar <sahar.fatima@intel.com> Co-authored-by: Javier Martinez <javier.e.martinez@intel.com> Co-authored-by: Bartlomiej Filipek <bartlomiej.filipek@intel.com> Co-authored-by: bopeng1234 <bo.peng@intel.com> Co-authored-by: Eric Crawford <eric.r.crawford@intel.com> Co-authored-by: MayureshV1 <47039074+MayureshV1@users.noreply.github.com> Co-authored-by: TejalKhade28 <tejal.khade@intel.com> Co-authored-by: Vishnudas Thaniel S <vishnudas.thaniel.s@intel.com> Co-authored-by: Yaru Du <yaru.du@intel.com> Co-authored-by: Ryan Metcalfe <107415876+RyanMetcalfeInt8@users.noreply.github.com> Co-authored-by: Dvoretckii, Mikhail <mikhail.dvoretckii@intel.com> Co-authored-by: Pallavi Gupta <pallavi.gupta@intel.com> Co-authored-by: Jianhui Dai <jianhui.j.dai@intel.com> Co-authored-by: Jiajia Qin <jiajiaqin@microsoft.com> Co-authored-by: Changming Sun <chasun@microsoft.com> Co-authored-by: Fei Chen <feich@microsoft.com> Co-authored-by: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Co-authored-by: Akupadhye <aupadhye@qti.qualcomm.com> Co-authored-by: Wang Ning <ning4.wang@intel.com> Co-authored-by: Maximilian Müller <44298237+gedoensmax@users.noreply.github.com> Co-authored-by: Chi Lo <54722500+chilo-ms@users.noreply.github.com> Co-authored-by: George Wu <jywu@microsoft.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Wanming Lin <wanming.lin@intel.com> Co-authored-by: quic-calvnguy <quic_calvnguy@quicinc.com> Co-authored-by: Jie Chen <jie.a.chen@intel.com> Co-authored-by: xhcao <xinghua.cao@intel.com> Co-authored-by: Wei-Sheng Chin <wschin@outlook.com> Co-authored-by: quic-hungjuiw <quic_hungjuiw@quicinc.com> Co-authored-by: Ian Hunter <ianfhunter@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kunal-vaishnavi <115581922+kunal-vaishnavi@users.noreply.github.com> Co-authored-by: Jeff Kilpatrick <jkilpatrick@qti.qualcomm.com> Co-authored-by: Jeff Kilpatrick <jkilpat@qti.qualcomm.com> Co-authored-by: Scott McKay <skottmckay@gmail.com> Co-authored-by: Nenad Banfic <46795300+nenad1002@users.noreply.github.com> Co-authored-by: derdeljan-msft <derdeljan@microsoft.com> Co-authored-by: n1harika <niharika.sathish@intel.com> Co-authored-by: Ryan Metcalfe <ryan.metcalfe@intel.com> Co-authored-by: Jaswanth Gannamaneni <jaswanth.gannamaneni@intel.com> Co-authored-by: Klimenko, Mikhail <mikhail.klimenko@intel.com> Co-authored-by: liang <gxgaoliang@126.com> Co-authored-by: Garth Long <garth.long@intel.com> Co-authored-by: Jonathan Clohessy <jonathan.clohessy@arm.com> Co-authored-by: Akshay Sonawane <111780983+apsonawane@users.noreply.github.com> Co-authored-by: Christopher Warrington <chwarr@microsoft.com> Co-authored-by: Ishwar Raut <iraut@nvidia.com> Co-authored-by: Gaurav Garg <gaugarg@nvidia.com> Co-authored-by: Xinpeng Dou <15529241576@163.com> Co-authored-by: adrastogi <aditya.rastogi@microsoft.com> Co-authored-by: Aditya Rastogi <adityar@ntdev.microsoft.com> Co-authored-by: qti-hungjuiw <hungjuiw@qti.qualcomm.com> Co-authored-by: Pradeep Sakhamoori <psakhamoori@microsoft.com> Co-authored-by: Adam Pocock <adam.pocock@oracle.com> Co-authored-by: mingyue <131847423+mingyueliuh@users.noreply.github.com> Co-authored-by: Susanta Bhattacharjee <susanta.bhattacharjee@intel.com> Co-authored-by: Jozef Wludzik <jozef.wludzik@intel.com> Co-authored-by: Rajeev Sekar <rajeevsekar21@gmail.com> Co-authored-by: Mayuresh M Varerkar <mayuresh.m.varerkar@intel.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Wenqin Yang <wenqin.yang@intel.com> Co-authored-by: xieofxie <xieofxie@126.com> Co-authored-by: hualxie <hualxie@microsoft.com> Co-authored-by: Joshua Lochner <admin@xenova.com> Co-authored-by: Christian Bourjau <cbourjau@users.noreply.github.com> Co-authored-by: Xiaofei Han <xiaofeihan@microsoft.com> Co-authored-by: Dmitri Smirnov <yuslepukhin@users.noreply.github.com> Co-authored-by: chunghow-qti <chunghow@qti.qualcomm.com> Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com> Co-authored-by: Jiawei Shao <jiawei.shao@intel.com> Co-authored-by: czekun <chen.zekun@intel.com> Co-authored-by: Jaskaran Singh Nagi <jaskaran.singh.nagi@intel.com> Co-authored-by: quic-tirupath <quic_tirupath@quicinc.com> Co-authored-by: qti-mattsinc <mattsinc@qti.qualcomm.com> Co-authored-by: Melike Kaptan <melike.kaptan@arm.com> Co-authored-by: Damien Dooley <damien.dooley@arm.com> Co-authored-by: qti-vaiskv <vaiskv@qti.qualcomm.com> Co-authored-by: Rohanjames1997 <rohan.james4@gmail.com> Co-authored-by: eserscor <erscor@microsoft.com> Co-authored-by: eserscor <247253654+eserscor@users.noreply.github.com> Co-authored-by: Nick Eubanks <nieubank@microsoft.com> Co-authored-by: adrastogi <8368026+adrastogi@users.noreply.github.com> Co-authored-by: Rohanjames1997 <rohanjms@amazon.com>

### Description This PR mainly modifies the followings: - Update `Graph_GetGraphView()` implementation. - Make sure EpGraph maintains the min/max node index, so that when querying node outside that range, it can return null. - Provide option to create an EpGraph that contains its parent node when the graph is the subgraph of a control flow op. #### Update Graph_GetGraphView() implementation In some cases, e.g. when model has a node that produces output consumed by multiple nodes, calling the current implementation of `Graph_GetGraphView()` to get a subgraph returns incorrect `OrtGraph.` - Original graph: <img width="414" height="356" alt="image" src="https://github.com/user-attachments/assets/739c092d-0880-4f6e-9351-e08e0e141b35" /> - Incorrect graph after calling `Graph_GetGraphView()` to get the subgraph: It includes three of the nodes from the original graph. The `topk_indices` is the output of the `TopK` and it shouldn't be added as a graph input shown in the graph below. The API implementation has issue handling this case. If we feed this subgraph into TRT parser, it would fail to parse the graph. <img width="349" height="341" alt="image" src="https://github.com/user-attachments/assets/1306e22c-7c5d-45a2-bc18-6864fa2966ba" /> - Correct graph after calling `Graph_GetGraphView()` to get the subgraph: It includes three of the nodes from the original graph. The `topk_indices` now is not added as a graph input. Instead, the `topk_indices` is added as a graph output which is expected as `Mod` is in another subgraph that consumes it, so this subgraph has to make `topk_indices` a graph output. <img width="413" height="350" alt="image" src="https://github.com/user-attachments/assets/b9135690-a341-41b2-9495-184030ab5cff" /> ### Motivation and Context

update

e1735d4

chilo-ms requested review from adrianlizarraga, edgchen1 and yuslepukhin December 3, 2025 00:36

fix compile error

3a3e63d

github-actions bot reviewed Dec 3, 2025

View reviewed changes

onnxruntime/test/ep_graph/test_ep_graph_utils.cc Outdated Show resolved Hide resolved

onnxruntime/test/ep_graph/test_ep_graph_utils.h Outdated Show resolved Hide resolved

chilo-ms added 3 commits December 2, 2025 17:30

lintrunner -a

982d6dc

add back test Check_Graph_GetSubgraph()

72fff82

Add implementation for GetConsumerNodes() for MINIMAL_BUILD

eb8c938

adrianlizarraga reviewed Dec 4, 2025

View reviewed changes

onnxruntime/core/session/onnxruntime_c_api.cc Show resolved Hide resolved

onnxruntime/core/session/onnxruntime_c_api.cc Show resolved Hide resolved

chilo-ms added 9 commits December 8, 2025 09:53

Add check node in EpGraph when getting GetProducerInfo/GetConsumerInfo

ade76c5

Log warning if the node is outside of the subgraph

059c918

Make EpGraph create parent node EpNode if the graph is a subgraph of …

0eafb99

…a control flow op

add macro for non minimal build

d94ba2a

Handle outer scope initializers for the subgraph

3bdca16

update ort_graph_to_proto.h

0f96d23

Merge branch 'main' into chi/update_graph_view_api

cfadecd

update ort_graph_to_proto.h

373d828

use graph.GetInitializer() instead of graph.GetConstantInitializer()

2e81538

chilo-ms added the release:1.24.0 label Jan 9, 2026

update ort_graph_to_proto.h to include missing initializers

d245852

edgchen1 reviewed Jan 14, 2026

View reviewed changes

chilo-ms added 3 commits January 14, 2026 10:46

Use the unified implementation for node arg to consumer nodes across …

b863464

…all builds

address reviewer's comment

492efa3

add comments to functions

53f1553

edgchen1 reviewed Jan 14, 2026

View reviewed changes

onnxruntime/core/graph/ep_api_types.cc Outdated Show resolved Hide resolved

onnxruntime/core/graph/ep_api_types.h Outdated Show resolved Hide resolved

adrianlizarraga reviewed Jan 14, 2026

View reviewed changes

include/onnxruntime/core/providers/utils/ort_graph_to_proto.h Outdated Show resolved Hide resolved

adrianlizarraga reviewed Jan 14, 2026

View reviewed changes

onnxruntime/core/graph/ep_api_types.cc Outdated Show resolved Hide resolved

chilo-ms added 2 commits January 14, 2026 18:47

address reveiwer's comments

7fbaa70

address reviewr's comments

428b2e9

edgchen1 reviewed Jan 16, 2026

View reviewed changes

adrianlizarraga reviewed Jan 16, 2026

View reviewed changes

onnxruntime/core/session/onnxruntime_c_api.cc Show resolved Hide resolved

edgchen1 reviewed Jan 17, 2026

View reviewed changes

onnxruntime/core/session/onnxruntime_c_api.cc Outdated Show resolved Hide resolved

onnxruntime/core/session/onnxruntime_c_api.cc Show resolved Hide resolved

chilo-ms added 4 commits January 19, 2026 09:21

address reviewer's comment

e9c1f8e

Revert the code in GraphViewer so that it stays the old behavior that…

e833a4a

… won't contain the outer-scope initializers

address reviewer's comments

78774d1

address reviewer's comments

ef35e91

adrianlizarraga approved these changes Jan 20, 2026

View reviewed changes

edgchen1 reviewed Jan 20, 2026

View reviewed changes

onnxruntime/core/graph/ep_api_types.cc Show resolved Hide resolved

onnxruntime/core/session/onnxruntime_c_api.cc Show resolved Hide resolved

edgchen1 approved these changes Jan 20, 2026

View reviewed changes

chilo-ms merged commit a0d4439 into main Jan 20, 2026
93 of 95 checks passed

chilo-ms deleted the chi/update_graph_view_api branch January 20, 2026 18:42

This was referenced Jan 21, 2026

1.24.0 release cherry-pick round 1 #27103

Closed

1.24.0 release cherry-pick round 1 #27104

Merged

tianleiwu added cherry-picked Cherry-picked for a cherrypicks branch and removed release:1.24.0 labels Jan 23, 2026

	std::unique_ptr<ComputeCapability> MakeComputeCapability(const GraphViewer& graph_viewer,
	const std::vector<const Node*>& group,
	const GenerateMetadefNameFn& generate_metadef_name,
	const std::string& execution_provider_name,
	bool drop_constant_initializers) {
	std::unordered_set<const Node*> node_set;
	node_set.reserve(group.size());
	node_set.insert(group.cbegin(), group.cend());

	std::unique_ptr<IndexedSubGraph> sub_graph = std::make_unique<IndexedSubGraph>();

	std::unordered_set<const NodeArg*> node_outputs;
	std::unordered_set<const NodeArg*> subgraph_inputs;
	std::unordered_set<const NodeArg*> subgraph_outputs;
	std::vector<const NodeArg*> ordered_subgraph_inputs;
	std::vector<const NodeArg*> ordered_subgraph_outputs;

	const auto& graph_output_list = graph_viewer.GetOutputs();
	std::unordered_set<const NodeArg*> graph_outputs(graph_output_list.cbegin(), graph_output_list.cend());

	for (const Node* node : group) {
	sub_graph->nodes.push_back(node->Index());

	for (const auto* input : node->InputDefs()) {
	if (!input->Exists()) {
	// skip the placeholder inputs
	continue;
	}
	// if the node input was not produced by this subgraph, add it to the subgraph inputs.
	if (!Contains(node_outputs, input)) {
	if (!Contains(subgraph_inputs, input)) {
	subgraph_inputs.insert(input);
	ordered_subgraph_inputs.push_back(input);
	}
	}
	}

	const auto& output_defs = node->OutputDefs();
	for (const auto* output_def : output_defs) {
	node_outputs.insert(output_def);
	// if output is overall graph output we need to produce it.
	if (Contains(graph_outputs, output_def)) {
	ordered_subgraph_outputs.push_back(output_def);
	}
	}

	// if output connects to a node not in this subgraph we need to add it
	// unless it was already added as an overall graph output,
	for (auto it = node->OutputEdgesBegin(), end = node->OutputEdgesEnd(); it != end; ++it) {
	if (!Contains(node_set, &it->GetNode())) {
	const auto* output_def = output_defs[it->GetSrcArgIndex()];
	if (!Contains(subgraph_outputs, output_def) && !Contains(graph_outputs, output_def)) {
	subgraph_outputs.insert(output_def);
	ordered_subgraph_outputs.push_back(output_def);
	}
	}
	}
	}

	// Assign inputs and outputs to subgraph's meta_def
	auto meta_def = std::make_unique<::onnxruntime::IndexedSubGraph::MetaDef>();
	meta_def->name = generate_metadef_name();
	meta_def->domain = execution_provider_name;
	meta_def->since_version = 1;
	meta_def->status = ONNX_NAMESPACE::EXPERIMENTAL;

	for (const auto& input : ordered_subgraph_inputs) {
	if (drop_constant_initializers && graph_viewer.IsConstantInitializer(input->Name(), true)) {
	continue;
	}

	meta_def->inputs.push_back(input->Name());
	}

	for (const auto& output : ordered_subgraph_outputs) {
	meta_def->outputs.push_back(output->Name());
	}

	sub_graph->SetMetaDef(std::move(meta_def));

	return std::make_unique<ComputeCapability>(std::move(sub_graph));
	}

Conversation

chilo-ms commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Update Graph_GetGraphView() implementation

Motivation and Context

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

adrianlizarraga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

chilo-ms commented Dec 3, 2025 •

edited

Loading